From 98b89bb7112a3bdc008ec62e5e62f063e9fa5eab Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 31 Aug 2005 08:45:10 +0000 Subject: [PATCH] This patch adjusts the plan9 loader to start "physical" ram at 0x80000000 virtual rather than the virtual address of the kernel image (which is higher). Tim Newsham --- tools/libxc/xc_load_aout9.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_load_aout9.c b/tools/libxc/xc_load_aout9.c index ba87dfe59f..93ec251cc4 100644 --- a/tools/libxc/xc_load_aout9.c +++ b/tools/libxc/xc_load_aout9.c @@ -15,6 +15,8 @@ #define round_pgup(_p) (((_p)+(PAGE_SIZE-1))&PAGE_MASK) #define round_pgdown(_p) ((_p)&PAGE_MASK) +#define KZERO 0x80000000 +#define KOFFSET(_p) ((_p)&~KZERO) static int parseaout9image(char *, unsigned long, struct domain_setup_info *); static int loadaout9image(char *, unsigned long, int, u32, unsigned long *, struct domain_setup_info *); @@ -63,7 +65,7 @@ parseaout9image( txtsz = round_pgup(ehdr.text); end = start + txtsz + ehdr.data + ehdr.bss; - dsi->v_start = start; + dsi->v_start = KZERO; dsi->v_kernstart = start; dsi->v_kernend = end; dsi->v_kernentry = ehdr.entry; @@ -83,19 +85,19 @@ loadaout9image( struct domain_setup_info *dsi) { struct Exec ehdr; - unsigned long txtsz; + unsigned long start, txtsz; if (!get_header(image, image_size, &ehdr)) { ERROR("Kernel image does not have a a.out9 header."); return -EINVAL; } + start = round_pgdown(ehdr.entry); txtsz = round_pgup(ehdr.text); copyout(xch, dom, parray, - 0, image, sizeof ehdr + ehdr.text); + start, image, sizeof ehdr + ehdr.text); copyout(xch, dom, parray, - txtsz, image + sizeof ehdr + ehdr.text, ehdr.data); - /* XXX zeroing of BSS needed? */ + start+txtsz, image + sizeof ehdr + ehdr.text, ehdr.data); /* XXX load symbols */ @@ -110,13 +112,14 @@ static void copyout( int xch, u32 dom, unsigned long *parray, - unsigned long off, + unsigned long addr, void *buf, int sz) { - unsigned long pgoff, chunksz; + unsigned long pgoff, chunksz, off; void *pg; + off = KOFFSET(addr); while (sz > 0) { pgoff = off & (PAGE_SIZE-1); chunksz = sz; -- 2.30.2